Revert (at least for now) the alt/cmd switching since it breaks the

2008-11-05  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c:
	(get_keyboard_modifiers_from_ns_event), (create_key_event): Revert
	(at least for now) the alt/cmd switching since it breaks the
	"alt-gr" functionality of alt which makes it impossible to input
	lots of characters.

svn path=/trunk/; revision=21761

diff --git a/ChangeLog b/ChangeLog
index b289c42da2c6cf32f2ecaf9d9d7b9eb241a0d982..73dfbb01133d9d9f3a7458e6b0347ab19a400101 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-05  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/gdkevents-quartz.c:
+       (get_keyboard_modifiers_from_ns_event), (create_key_event): Revert
+       (at least for now) the alt/cmd switching since it breaks the
+       "alt-gr" functionality of alt which makes it impossible to input
+       lots of characters.
+
 2008-11-05  Christian Dywan  <christian@imendio.com>
 
        Bug 559404 – gtk_editable_insert_text counts length in bytes

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index fc223a3d14c386e3d6a002bbf474dfb940aa1d3f..bc301955dab33ee5ff5ac618bf9be67a1f36dcd3 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -475,8 +475,6 @@ get_keyboard_modifiers_from_ns_event (NSEvent *nsevent)
   if (nsflags & NSControlKeyMask)
     modifiers |= GDK_CONTROL_MASK;
   if (nsflags & NSCommandKeyMask)
-    modifiers |= GDK_META_MASK;
-  if (nsflags & NSAlternateKeyMask)
     modifiers |= GDK_MOD1_MASK;
 
   return modifiers;
@@ -1587,7 +1585,7 @@ create_key_event (GdkWindow    *window,
         {
         case GDK_Meta_R:
         case GDK_Meta_L:
-          mask = GDK_META_MASK;
+          mask = GDK_MOD1_MASK;
           break;
         case GDK_Shift_R:
         case GDK_Shift_L:
@@ -1598,7 +1596,7 @@ create_key_event (GdkWindow    *window,
           break;
         case GDK_Alt_R:
         case GDK_Alt_L:
-          mask = GDK_MOD1_MASK;
+          mask = GDK_MOD5_MASK;
           break;
         case GDK_Control_R:
         case GDK_Control_L: